widget: gtk_widget_get_clipboard => gtk_widget_get_old_clipboard

Just rename the function, so the previous one can be used for the
new clipboard.

diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c
index 0cee9f614439605ad4a02767fcaa810b0a623f86..c0b08a1b548ae330b56dd6ee809f830828767f78 100644 (file)
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -23,7 +23,7 @@ copy_button_clicked (GtkWidget *button,
   entry = GTK_WIDGET (user_data);
 
   /* Get the clipboard object */
-  clipboard = gtk_widget_get_clipboard (entry,
+  clipboard = gtk_widget_get_old_clipboard (entry,
                                         GDK_SELECTION_CLIPBOARD);
 
   /* Set clipboard text */
@@ -54,7 +54,7 @@ paste_button_clicked (GtkWidget *button,
   entry = GTK_WIDGET (user_data);
 
   /* Get the clipboard object */
-  clipboard = gtk_widget_get_clipboard (entry,
+  clipboard = gtk_widget_get_old_clipboard (entry,
                                         GDK_SELECTION_CLIPBOARD);
 
   /* Request the contents of the clipboard, contents_received will be

diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index 47dba4c56d6a96186ebf3d1732812e39712ede2e..3de7bd47a80af0ffa9c7ea8a22227109e8c8663f 100644 (file)
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -1235,7 +1235,7 @@ handle_cutcopypaste (GtkWidget *button, GtkWidget *textview)
   GtkClipboard *clipboard;
   const gchar *id;
 
-  clipboard = gtk_widget_get_clipboard (textview, GDK_SELECTION_CLIPBOARD);
+  clipboard = gtk_widget_get_old_clipboard (textview, GDK_SELECTION_CLIPBOARD);
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
   id = gtk_buildable_get_name (GTK_BUILDABLE (button));
 
@@ -1837,7 +1837,7 @@ activate (GApplication *app)
                     G_CALLBACK (textbuffer_notify_selection), widget);
   widget = (GtkWidget *)gtk_builder_get_object (builder, "pastebutton");
   g_signal_connect (widget, "clicked", G_CALLBACK (handle_cutcopypaste), widget2);
-  g_signal_connect_object (gtk_widget_get_clipboard (widget2, GDK_SELECTION_CLIPBOARD), "owner-change",
+  g_signal_connect_object (gtk_widget_get_old_clipboard (widget2, GDK_SELECTION_CLIPBOARD), "owner-change",
                            G_CALLBACK (clipboard_owner_change), widget, 0);
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "osd_frame");

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 00eb3e15f15b21196cbe092be29a221d905489e9..ebd4a4cfb291073fc3e3035ed800ea80dc3c4a85 100644 (file)
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -4530,7 +4530,7 @@ gtk_widget_freeze_child_notify
 gtk_widget_get_child_visible
 gtk_widget_get_parent
 gtk_widget_get_settings
-gtk_widget_get_clipboard
+gtk_widget_get_old_clipboard
 gtk_widget_get_display
 gtk_widget_get_size_request
 gtk_widget_set_child_visible

diff --git a/examples/bp/bloatpad.c b/examples/bp/bloatpad.c
index c6309d43e9822b4cc4d552f06109536061ba0bb2..5a52f92d571b4cda79417e27e98c0d3533a25930 100644 (file)
--- a/examples/bp/bloatpad.c
+++ b/examples/bp/bloatpad.c
@@ -96,7 +96,7 @@ change_justify_state (GSimpleAction *action,
 static GtkClipboard *
 get_clipboard (GtkWidget *widget)
 {
-  return gtk_widget_get_clipboard (widget, gdk_atom_intern_static_string ("CLIPBOARD"));
+  return gtk_widget_get_old_clipboard (widget, gdk_atom_intern_static_string ("CLIPBOARD"));
 }
 
 static void

diff --git a/examples/plugman.c b/examples/plugman.c
index 5f70dbb287731c6a1a86f3eb7f3dacdda3d54125..86055877790d22c4e67b1483048efa8cf1dddbaf 100644 (file)
--- a/examples/plugman.c
+++ b/examples/plugman.c
@@ -41,7 +41,7 @@ change_fullscreen_state (GSimpleAction *action,
 static GtkClipboard *
 get_clipboard (GtkWidget *widget)
 {
-  return gtk_widget_get_clipboard (widget, gdk_atom_intern_static_string ("CLIPBOARD"));
+  return gtk_widget_get_old_clipboard (widget, gdk_atom_intern_static_string ("CLIPBOARD"));
 }
 
 static void

diff --git a/gtk/a11y/gtkentryaccessible.c b/gtk/a11y/gtkentryaccessible.c
index 02c0fc69c52706c3180f51a31b7d90a3d916a151..eceaacd8da858e1eb7b9bbc2315dd89e3540efbe 100644 (file)
--- a/gtk/a11y/gtkentryaccessible.c
+++ b/gtk/a11y/gtkentryaccessible.c
@@ -1265,7 +1265,7 @@ gtk_entry_accessible_copy_text (AtkEditableText *text,
 
   editable = GTK_EDITABLE (widget);
   str = gtk_editable_get_chars (editable, start_pos, end_pos);
-  clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_CLIPBOARD);
+  clipboard = gtk_widget_get_old_clipboard (widget, GDK_SELECTION_CLIPBOARD);
   gtk_clipboard_set_text (clipboard, str, -1);
   g_free (str);
 }
@@ -1289,7 +1289,7 @@ gtk_entry_accessible_cut_text (AtkEditableText *text,
     return;
 
   str = gtk_editable_get_chars (editable, start_pos, end_pos);
-  clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_CLIPBOARD);
+  clipboard = gtk_widget_get_old_clipboard (widget, GDK_SELECTION_CLIPBOARD);
   gtk_clipboard_set_text (clipboard, str, -1);
   gtk_editable_delete_text (editable, start_pos, end_pos);
 }
@@ -1356,7 +1356,7 @@ gtk_entry_accessible_paste_text (AtkEditableText *text,
   paste->position = position;
 
   g_object_ref (paste->entry);
-  clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_CLIPBOARD);
+  clipboard = gtk_widget_get_old_clipboard (widget, GDK_SELECTION_CLIPBOARD);
   gtk_clipboard_request_text (clipboard, paste_received_cb, paste);
 }
 

diff --git a/gtk/a11y/gtktextviewaccessible.c b/gtk/a11y/gtktextviewaccessible.c
index bfc366254cd6c9581a39ec8b6bdd6e29447d95a1..e99df0b5f04b6888af4c32b664e78212679800d1 100644 (file)
--- a/gtk/a11y/gtktextviewaccessible.c
+++ b/gtk/a11y/gtktextviewaccessible.c
@@ -1612,7 +1612,7 @@ gtk_text_view_accessible_copy_text (AtkEditableText *text,
   gtk_text_buffer_get_iter_at_offset (buffer, &end, end_pos);
   str = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
 
-  clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_CLIPBOARD);
+  clipboard = gtk_widget_get_old_clipboard (widget, GDK_SELECTION_CLIPBOARD);
   gtk_clipboard_set_text (clipboard, str, -1);
 }
 
@@ -1640,7 +1640,7 @@ gtk_text_view_accessible_cut_text (AtkEditableText *text,
   gtk_text_buffer_get_iter_at_offset (buffer, &start, start_pos);
   gtk_text_buffer_get_iter_at_offset (buffer, &end, end_pos);
   str = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_CLIPBOARD);
+  clipboard = gtk_widget_get_old_clipboard (widget, GDK_SELECTION_CLIPBOARD);
   gtk_clipboard_set_text (clipboard, str, -1);
   gtk_text_buffer_delete (buffer, &start, &end);
 }
@@ -1716,7 +1716,7 @@ gtk_text_view_accessible_paste_text (AtkEditableText *text,
   paste.position = position;
 
   g_object_ref (paste.buffer);
-  clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_CLIPBOARD);
+  clipboard = gtk_widget_get_old_clipboard (widget, GDK_SELECTION_CLIPBOARD);
   gtk_clipboard_request_text (clipboard, paste_received, &paste);
 }
 

diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index 8ace68dfefae692659373d31d4dd13a9a3268f0f..fcd9776d0ddcbdada8bc7ab19db920145d767134 100644 (file)
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -384,7 +384,7 @@ selection_get_cb (GtkWidget          *widget,
 {
   GtkClipboard *clipboard;
 
-  clipboard = gtk_widget_get_clipboard (widget,
+  clipboard = gtk_widget_get_old_clipboard (widget,
                                         gtk_selection_data_get_selection (selection_data));
 
   if (clipboard && clipboard->get_func)
@@ -399,7 +399,7 @@ selection_clear_event_cb (GtkWidget     *widget,
   GtkClipboard *clipboard;
 
   gdk_event_get_selection ((GdkEvent *)event, &selection);
-  clipboard = gtk_widget_get_clipboard (widget, selection);
+  clipboard = gtk_widget_get_old_clipboard (widget, selection);
 
   if (clipboard)
     {
@@ -916,7 +916,7 @@ selection_received (GtkWidget            *widget,
   RequestContentsInfo *request_info = get_request_contents_info (widget);
   set_request_contents_info (widget, NULL);
 
-  request_info->callback (gtk_widget_get_clipboard (widget, gtk_selection_data_get_selection (selection_data)),
+  request_info->callback (gtk_widget_get_old_clipboard (widget, gtk_selection_data_get_selection (selection_data)),
                          selection_data,
                          request_info->user_data);
 

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index ad02ab141c167f6e199e98594e45cdd728e9e04a..2fc8bb43ae6623238088b6eeeffa849767bf3608 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -3023,7 +3023,7 @@ gtk_entry_unrealize (GtkWidget *widget)
   
   gtk_im_context_set_client_widget (priv->im_context, NULL);
 
-  clipboard = gtk_widget_get_clipboard (widget, GDK_SELECTION_PRIMARY);
+  clipboard = gtk_widget_get_old_clipboard (widget, GDK_SELECTION_PRIMARY);
   if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (entry))
     gtk_clipboard_clear (clipboard);
 
@@ -5117,7 +5117,7 @@ gtk_entry_copy_clipboard (GtkEntry *entry)
         }
 
       str = _gtk_entry_get_display_text (entry, start, end);
-      gtk_clipboard_set_text (gtk_widget_get_clipboard (GTK_WIDGET (entry),
+      gtk_clipboard_set_text (gtk_widget_get_old_clipboard (GTK_WIDGET (entry),
                                                        GDK_SELECTION_CLIPBOARD),
                              str, -1);
       g_free (str);
@@ -6550,7 +6550,7 @@ gtk_entry_paste (GtkEntry *entry,
                 GdkAtom   selection)
 {
   g_object_ref (entry);
-  gtk_clipboard_request_text (gtk_widget_get_clipboard (GTK_WIDGET (entry), selection),
+  gtk_clipboard_request_text (gtk_widget_get_old_clipboard (GTK_WIDGET (entry), selection),
                              paste_received, entry);
 }
 
@@ -6593,7 +6593,7 @@ gtk_entry_update_primary_selection (GtkEntry *entry)
   list = gdk_content_formats_new (NULL, 0);
   list = gtk_content_formats_add_text_targets (list);
 
-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (entry), GDK_SELECTION_PRIMARY);
+  clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (entry), GDK_SELECTION_PRIMARY);
   
   if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start, &end))
     {
@@ -8580,7 +8580,7 @@ gtk_entry_do_popup (GtkEntry       *entry,
   info->entry = g_object_ref (entry);
   info->trigger_event = event ? gdk_event_copy (event) : gtk_get_current_event ();
 
-  gtk_clipboard_request_contents (gtk_widget_get_clipboard (GTK_WIDGET (entry), GDK_SELECTION_CLIPBOARD),
+  gtk_clipboard_request_contents (gtk_widget_get_old_clipboard (GTK_WIDGET (entry), GDK_SELECTION_CLIPBOARD),
                                  gdk_atom_intern_static_string ("TARGETS"),
                                  popup_targets_received,
                                  info);
@@ -8763,7 +8763,7 @@ gtk_entry_selection_bubble_popup_show (gpointer user_data)
 {
   GtkEntry *entry = user_data;
 
-  gtk_clipboard_request_contents (gtk_widget_get_clipboard (GTK_WIDGET (entry), GDK_SELECTION_CLIPBOARD),
+  gtk_clipboard_request_contents (gtk_widget_get_old_clipboard (GTK_WIDGET (entry), GDK_SELECTION_CLIPBOARD),
                                   gdk_atom_intern_static_string ("TARGETS"),
                                   bubble_targets_received,
                                   entry);

diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index c788f50073fe772080cc0984b56f2cbcbcfc3d2b..8b2adcc270133531ad46fadfc5356643dccdae51 100644 (file)
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -1726,7 +1726,7 @@ copy_file_location_cb (GSimpleAction *action,
       GtkClipboard *clipboard;
       GdkContentFormats *target_list;
 
-      clipboard = gtk_widget_get_clipboard (GTK_WIDGET (impl), GDK_SELECTION_CLIPBOARD);
+      clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (impl), GDK_SELECTION_CLIPBOARD);
 
       target_list = gdk_content_formats_new (NULL, 0);
       target_list = gtk_content_formats_add_text_targets (target_list);
@@ -6708,7 +6708,7 @@ paste_text_received (GtkClipboard         *clipboard,
 static void
 location_popup_on_paste_handler (GtkFileChooserWidget *impl)
 {
-  GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (impl),
+  GtkClipboard *clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (impl),
                                                       GDK_SELECTION_CLIPBOARD);
   gtk_clipboard_request_text (clipboard,
                               (GtkClipboardTextReceivedFunc) paste_text_received,

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 882ab1e702be365f6eaa9b44257aaf26c58f9e58..bc83460184aebf5e81f8320df6d8fac6220892e4 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -5221,7 +5221,7 @@ gtk_label_select_region_index (GtkLabel *label,
       priv->select_info->selection_anchor = anchor_index;
       priv->select_info->selection_end = end_index;
 
-      clipboard = gtk_widget_get_clipboard (GTK_WIDGET (label),
+      clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (label),
                                             GDK_SELECTION_PRIMARY);
 
       if (anchor_index != end_index)
@@ -5922,7 +5922,7 @@ gtk_label_copy_clipboard (GtkLabel *label)
       if (start > len)
         start = len;
 
-      clipboard = gtk_widget_get_clipboard (GTK_WIDGET (label), GDK_SELECTION_CLIPBOARD);
+      clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (label), GDK_SELECTION_CLIPBOARD);
 
       if (start != end)
        gtk_clipboard_set_text (clipboard, priv->text + start, end - start);
@@ -6003,7 +6003,7 @@ copy_link_activate_cb (GtkMenuItem *menuitem,
   GtkClipboard *clipboard;
 
   link = g_object_get_qdata (G_OBJECT (menuitem), quark_link);
-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (label), GDK_SELECTION_CLIPBOARD);
+  clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (label), GDK_SELECTION_CLIPBOARD);
   gtk_clipboard_set_text (clipboard, link->uri, -1);
 }
 

diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
index d4cb05ab8907619b23c6914d4b72086f34c5bc6c..7ff83262d493eb1320fb1c1906911987ee4226db 100644 (file)
--- a/gtk/gtklinkbutton.c
+++ b/gtk/gtklinkbutton.c
@@ -332,7 +332,7 @@ copy_activate_cb (GtkWidget     *widget,
 {
   GtkLinkButtonPrivate *priv = link_button->priv;
   
-  gtk_clipboard_set_text (gtk_widget_get_clipboard (GTK_WIDGET (link_button),
+  gtk_clipboard_set_text (gtk_widget_get_old_clipboard (GTK_WIDGET (link_button),
                                                    GDK_SELECTION_CLIPBOARD),
                          priv->uri, -1);
 }

diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index 97a090000eeacd3a875798e75325f4a0dee7fa7c..2e3708b61d65276f856bf765151c27f41828eee1 100644 (file)
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -1460,7 +1460,7 @@ copy_activated_cb (GtkMenuItem *menu_item,
 
   utf8_uri = gtk_recent_info_get_uri_display (info);
   
-  gtk_clipboard_set_text (gtk_widget_get_clipboard (GTK_WIDGET (impl),
+  gtk_clipboard_set_text (gtk_widget_get_old_clipboard (GTK_WIDGET (impl),
                                                    GDK_SELECTION_CLIPBOARD),
                           utf8_uri, -1);
 

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index d774f390b49602485591f8c6d0c232a5927ae666..f8c5376d3442321f29767d5e323bbabd9bb02efc 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -1894,7 +1894,7 @@ gtk_text_view_set_buffer (GtkTextView   *text_view,
 
       if (gtk_widget_get_realized (GTK_WIDGET (text_view)))
        {
-         GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+         GtkClipboard *clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
                                                              GDK_SELECTION_PRIMARY);
          gtk_text_buffer_remove_selection_clipboard (priv->buffer, clipboard);
         }
@@ -1948,7 +1948,7 @@ gtk_text_view_set_buffer (GtkTextView   *text_view,
 
       if (gtk_widget_get_realized (GTK_WIDGET (text_view)))
        {
-         GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+         GtkClipboard *clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
                                                              GDK_SELECTION_PRIMARY);
          gtk_text_buffer_add_selection_clipboard (priv->buffer, clipboard);
        }
@@ -4582,7 +4582,7 @@ gtk_text_view_realize (GtkWidget *widget)
 
   if (priv->buffer)
     {
-      GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+      GtkClipboard *clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
                                                          GDK_SELECTION_PRIMARY);
       gtk_text_buffer_add_selection_clipboard (priv->buffer, clipboard);
     }
@@ -4602,7 +4602,7 @@ gtk_text_view_unrealize (GtkWidget *widget)
 
   if (priv->buffer)
     {
-      GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+      GtkClipboard *clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
                                                          GDK_SELECTION_PRIMARY);
       gtk_text_buffer_remove_selection_clipboard (priv->buffer, clipboard);
     }
@@ -5289,7 +5289,7 @@ gtk_text_view_multipress_gesture_pressed (GtkGestureMultiPress *gesture,
       get_iter_from_gesture (text_view, priv->multipress_gesture,
                              &iter, NULL, NULL);
       gtk_text_buffer_paste_clipboard (get_buffer (text_view),
-                                       gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+                                       gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
                                                                  GDK_SELECTION_PRIMARY),
                                        &iter,
                                        priv->editable);
@@ -6770,7 +6770,7 @@ gtk_text_view_backspace (GtkTextView *text_view)
 static void
 gtk_text_view_cut_clipboard (GtkTextView *text_view)
 {
-  GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+  GtkClipboard *clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
                                                      GDK_SELECTION_CLIPBOARD);
   
   gtk_text_buffer_cut_clipboard (get_buffer (text_view),
@@ -6785,7 +6785,7 @@ gtk_text_view_cut_clipboard (GtkTextView *text_view)
 static void
 gtk_text_view_copy_clipboard (GtkTextView *text_view)
 {
-  GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+  GtkClipboard *clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
                                                      GDK_SELECTION_CLIPBOARD);
   
   gtk_text_buffer_copy_clipboard (get_buffer (text_view),
@@ -6797,7 +6797,7 @@ gtk_text_view_copy_clipboard (GtkTextView *text_view)
 static void
 gtk_text_view_paste_clipboard (GtkTextView *text_view)
 {
-  GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+  GtkClipboard *clipboard = gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
                                                      GDK_SELECTION_CLIPBOARD);
   
   gtk_text_buffer_paste_clipboard (get_buffer (text_view),
@@ -8921,7 +8921,7 @@ gtk_text_view_do_popup (GtkTextView    *text_view,
   info->text_view = g_object_ref (text_view);
   info->trigger_event = event ? gdk_event_copy (event) : gtk_get_current_event ();
 
-  gtk_clipboard_request_contents (gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+  gtk_clipboard_request_contents (gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
                                                            GDK_SELECTION_CLIPBOARD),
                                  gdk_atom_intern_static_string ("TARGETS"),
                                  popup_targets_received,
@@ -9111,7 +9111,7 @@ static gboolean
 gtk_text_view_selection_bubble_popup_show (gpointer user_data)
 {
   GtkTextView *text_view = user_data;
-  gtk_clipboard_request_contents (gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+  gtk_clipboard_request_contents (gtk_widget_get_old_clipboard (GTK_WIDGET (text_view),
                                                            GDK_SELECTION_CLIPBOARD),
                                  gdk_atom_intern_static_string ("TARGETS"),
                                  bubble_targets_received,

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 68b6d15bfa33f5e8bcbce3ec116dc49bdd3c6b07..4d250c9bb801d55bcb476a609f972baa10a63189 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -12380,7 +12380,7 @@ gtk_widget_set_margin_bottom (GtkWidget *widget,
 }
 
 /**
- * gtk_widget_get_clipboard:
+ * gtk_widget_get_old_clipboard:
  * @widget: a #GtkWidget
  * @selection: a #GdkAtom which identifies the clipboard
  *             to use. %GDK_SELECTION_CLIPBOARD gives the
@@ -12401,7 +12401,7 @@ gtk_widget_set_margin_bottom (GtkWidget *widget,
  * Since: 2.2
  **/
 GtkClipboard *
-gtk_widget_get_clipboard (GtkWidget *widget, GdkAtom selection)
+gtk_widget_get_old_clipboard (GtkWidget *widget, GdkAtom selection)
 {
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index ff3aaf25254a13b0a33c974cbd0f33f4aa7bc1fc..5631299d4130543e2c621468c34f53babab405e2 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -783,7 +783,7 @@ GdkDisplay *  gtk_widget_get_display     (GtkWidget *widget);
 GDK_AVAILABLE_IN_ALL
 GtkSettings*  gtk_widget_get_settings    (GtkWidget *widget);
 GDK_AVAILABLE_IN_ALL
-GtkClipboard *gtk_widget_get_clipboard   (GtkWidget *widget,
+GtkClipboard *gtk_widget_get_old_clipboard   (GtkWidget *widget,
                                          GdkAtom    selection);